Some minor changes

A little bit of cleaning things up
